@@ -26,11 +26,11 @@
 import org.apache.commons.logging.LogFactory;
 
 import com.bitzi.util.Base32;
-import com.limegroup.gnutella.browser.MagnetOptions;
+//import com.limegroup.gnutella.browser.MagnetOptions;
 import com.limegroup.gnutella.downloader.CantResumeException;
-import com.limegroup.gnutella.downloader.InNetworkDownloader;
+//import com.limegroup.gnutella.downloader.InNetworkDownloader;
 import com.limegroup.gnutella.downloader.IncompleteFileManager;
-import com.limegroup.gnutella.downloader.MagnetDownloader;
+//import com.limegroup.gnutella.downloader.MagnetDownloader;
 import com.limegroup.gnutella.downloader.ManagedDownloader;
 import com.limegroup.gnutella.downloader.RequeryDownloader;
 import com.limegroup.gnutella.downloader.ResumeDownloader;
@@ -203,7 +203,7 @@
     protected void initialize(DownloadCallback guiCallback, MessageRouter router,
                               FileManager fileManager) {
         this.callback = guiCallback;
-        this.innetworkCallback = new InNetworkCallback();
+        //this.innetworkCallback = new InNetworkCallback();
         this.router = router;
         this.fileManager = fileManager;
         scheduleWaitingPump();
@@ -258,6 +258,7 @@
     /**
      * Determines if an 'In Network' download exists in either active or waiting.
      */
+    /*
     public synchronized boolean hasInNetworkDownload() {
         if(innetworkCount > 0)
             return true;
@@ -267,11 +268,13 @@
         }
         return false;
     }
+    */
     
     /**
      * Kills all in-network downloaders that are not present in the list of URNs
      * @param urns a current set of urns that we are downloading in-network.
      */
+    /*
     public synchronized void killDownloadersNotListed(Collection updates) {
         if (updates == null)
             return;
@@ -294,6 +297,7 @@
         hopeless.retainAll(urns);
         UpdateSettings.FAILED_UPDATES.setValue(hopeless);
     }
+    */
     
     /**
      * Schedules the runnable that pumps through waiting downloads.
@@ -328,8 +332,10 @@
                 cleanupCompletedDownload(md, false);
             } else if(hasFreeSlot() && (md.hasNewSources() || md.getRemainingStateTime() <= 0)) {
                 i.remove();
+                /*
                 if(md instanceof InNetworkDownloader)
                     innetworkCount++;
+                */
                 active.add(md);
                 md.startDownload();
             } else {
@@ -640,6 +646,7 @@
 	 *  null 
      * @throws SaveLocationException 
      */
+    /*
     public synchronized Downloader download(MagnetOptions magnet,
 			boolean overwrite,
 			File saveDir,
@@ -674,6 +681,7 @@
         initializeDownload(downloader);
         return downloader;
     }
+    */
 
     /**
      * Starts a resume download for the given incomplete file.
@@ -736,6 +744,7 @@
     /**
      * Downloads an InNetwork update, using the info from the DownloadInformation.
      */
+    /*
     public synchronized Downloader download(DownloadInformation info, long now) 
     throws SaveLocationException {
         File dir = FileManager.PREFERENCE_SHARE;
@@ -750,6 +759,7 @@
         initializeDownload(d);
         return d;
     }
+    */
         
     
     /**
@@ -774,7 +784,8 @@
      * Returns the callback that should be used for the given md.
      */
     private DownloadCallback callback(ManagedDownloader md) {
-        return (md instanceof InNetworkDownloader) ? innetworkCallback : callback;
+        //return (md instanceof InNetworkDownloader) ? innetworkCallback : callback;
+        return callback;
     }
         
 	/**
@@ -988,8 +999,10 @@
     public synchronized void remove(ManagedDownloader downloader, 
                                     boolean completed) {
         active.remove(downloader);
+        /*
         if(downloader instanceof InNetworkDownloader)
             innetworkCount--;
+        */
         
         waiting.remove(downloader);
         if(completed)
@@ -1504,8 +1517,10 @@
         boolean c = false;
         for (Iterator iter = activeCopy.iterator(); iter.hasNext(); ) {
             BandwidthTracker bt = (BandwidthTracker)iter.next();
+            /*
             if (bt instanceof InNetworkDownloader)
                 continue;
+            */
             
             c = true;
             bt.measureBandwidth();
@@ -1530,8 +1545,10 @@
         float sum=0;
         for (Iterator iter = activeCopy.iterator(); iter.hasNext(); ) {
             BandwidthTracker bt = (BandwidthTracker)iter.next();
+            /*
             if (bt instanceof InNetworkDownloader)
                 continue;
+            */
             
             float curr = 0;
             try{
@@ -1627,6 +1644,7 @@
     /**
      * Once an in-network download finishes, the UpdateHandler is notified.
      */
+   /*
     private static class InNetworkCallback implements DownloadCallback {
         public void addDownload(Downloader d) {}
         public void removeDownload(Downloader d) {
@@ -1644,6 +1662,7 @@
         }
         public String getHostValue(String key) { return null; }
     }
+    */
 	
 
     /** Simple ConnectObserver for FWT connections. */
@@ -1661,4 +1680,13 @@
         }
     }
     
+    /* cabos */
+    public Iterator getDownloads() {
+    	List downloads = new ArrayList();
+    	synchronized (this) {
+    		downloads.addAll(active);
+    		downloads.addAll(waiting);
+    	}
+    	return downloads.iterator();
+    }
 }
